Skip to contentSkip to conversation

Change in openvpn[master]: GHA: Use CMake 4.0 and apply required fixes

Openvpn-devel In review flichtenheld (Code Review) 2 participants 6 messages Apr 8, 2025 – Apr 9, 2025 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1744115087000.Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd@...2715...

#1 lore raw

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/934?usp=email

to review the following change.

Change subject: GHA: Use CMake 4.0 and apply required fixes
......................................................................

GHA: Use CMake 4.0 and apply required fixes

- update vcpkg reference to 856505bb76
This includes a general work-around for the CMake 4.0 compat. See commit a1aebfa9d5eae7cf493e0a706b43915d687bb860.
- update lukka/get-cmake action to v4
- update dependency aws/aws-lc to v1.49.1

Change-Id Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd

---
M .github/workflows/build.yaml

1 file changed, 8 insertions(+), 8 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/34/934/1

.github/workflows/build.yaml +8 -8
index 2df495c..0f5e617 100644
@@ -54,11 +54,11 @@
     steps:
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
       - name: Install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
       - name: Install dependencies
         run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
       - name: configure OpenVPN with cmake
@@ -88,11 +88,11 @@
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
           vcpkgJsonGlob: '**/mingw/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest
@@ -276,7 +276,7 @@
       runs-on: windows-latest
       steps:
       - uses: actions/[email protected]... # v4.2.2
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
 
       - name: Install rst2html
         run: python -m pip install --upgrade pip docutils
@@ -284,7 +284,7 @@
       - name: Restore artifacts, or setup vcpkg (do not install any package)
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
           vcpkgJsonGlob: '**/windows/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest (NO TESTS)
@@ -471,8 +471,8 @@
           path: aws-lc
           # versioning=semver-coerced
           repository: aws/aws-lc
-          ref: v1.42.0
-      - uses: lukka/[email protected]... # v3.31.6
+          ref: v1.49.1
+      - uses: lukka/[email protected]... # v4.0.0
       - name: "AWS-LC: build"
         run: |
           mkdir build

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/934?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd
Gerrit-Change-Number: 934
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

uddr has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/934?usp=email )

Change subject: GHA: Use CMake 4.0 and apply required fixes
......................................................................

Patch Set 1: Code-Review+2

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/934?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd
Gerrit-Change-Number: 934
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: uddr <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 08 Apr 2025 18:28:20 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#3 lore raw

PATCH 1/1 GHA: Use CMake 4.0 and apply required fixes

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

- update vcpkg reference to 856505bb76
This includes a general work-around for the CMake 4.0 compat. See commit a1aebfa9d5eae7cf493e0a706b43915d687bb860.
- update lukka/get-cmake action to v4
- update dependency aws/aws-lc to v1.49.1

Change-Id Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/934
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Yuriy Darnobyt <[email protected]...>

.github/workflows/build.yaml +8 -8
index 2df495c..0f5e617 100644
@@ -54,11 +54,11 @@
     steps:
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
       - name: Install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
       - name: Install dependencies
         run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
       - name: configure OpenVPN with cmake
@@ -88,11 +88,11 @@
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
           vcpkgJsonGlob: '**/mingw/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest
@@ -276,7 +276,7 @@
       runs-on: windows-latest
       steps:
       - uses: actions/[email protected]... # v4.2.2
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
 
       - name: Install rst2html
         run: python -m pip install --upgrade pip docutils
@@ -284,7 +284,7 @@
       - name: Restore artifacts, or setup vcpkg (do not install any package)
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
           vcpkgJsonGlob: '**/windows/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest (NO TESTS)
@@ -471,8 +471,8 @@
           path: aws-lc
           # versioning=semver-coerced
           repository: aws/aws-lc
-          ref: v1.42.0
-      - uses: lukka/[email protected]... # v3.31.6
+          ref: v1.49.1
+      - uses: lukka/[email protected]... # v4.0.0
       - name: "AWS-LC: build"
         run: |
           mkdir build
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: GHA: Use CMake 4.0 and apply required fixes

I have no idea what this all does, but Frank and Yuriy have, and GH confirms that "things build nicely". So in it goes.

Your patch has been applied to the master branch.

commit 3c6212588d5d73b46219d6223995acf9546693f2

Author: Frank Lichtenheld
Date:   Wed Apr 9 15:11:42 2025 +0200
     GHA: Use CMake 4.0 and apply required fixes

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Yuriy Darnobyt <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg31399.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/934?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by uddr

Change subject: GHA: Use CMake 4.0 and apply required fixes
......................................................................

GHA: Use CMake 4.0 and apply required fixes

- update vcpkg reference to 856505bb76
This includes a general work-around for the CMake 4.0 compat. See commit a1aebfa9d5eae7cf493e0a706b43915d687bb860.
- update lukka/get-cmake action to v4
- update dependency aws/aws-lc to v1.49.1

Change-Id Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31399.html

---
M .github/workflows/build.yaml

1 file changed, 8 insertions(+), 8 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/34/934/2

.github/workflows/build.yaml +8 -8
index 2df495c..0f5e617 100644
@@ -54,11 +54,11 @@
     steps:
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
       - name: Install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
       - name: Install dependencies
         run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
       - name: configure OpenVPN with cmake
@@ -88,11 +88,11 @@
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
           vcpkgJsonGlob: '**/mingw/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest
@@ -276,7 +276,7 @@
       runs-on: windows-latest
       steps:
       - uses: actions/[email protected]... # v4.2.2
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
 
       - name: Install rst2html
         run: python -m pip install --upgrade pip docutils
@@ -284,7 +284,7 @@
       - name: Restore artifacts, or setup vcpkg (do not install any package)
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
           vcpkgJsonGlob: '**/windows/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest (NO TESTS)
@@ -471,8 +471,8 @@
           path: aws-lc
           # versioning=semver-coerced
           repository: aws/aws-lc
-          ref: v1.42.0
-      - uses: lukka/[email protected]... # v3.31.6
+          ref: v1.49.1
+      - uses: lukka/[email protected]... # v4.0.0
       - name: "AWS-LC: build"
         run: |
           mkdir build

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/934?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd
Gerrit-Change-Number: 934
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: uddr <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/934?usp=email )

Change subject: GHA: Use CMake 4.0 and apply required fixes
......................................................................

GHA: Use CMake 4.0 and apply required fixes

- update vcpkg reference to 856505bb76
This includes a general work-around for the CMake 4.0 compat. See commit a1aebfa9d5eae7cf493e0a706b43915d687bb860.
- update lukka/get-cmake action to v4
- update dependency aws/aws-lc to v1.49.1

Change-Id Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31399.html

---
M .github/workflows/build.yaml

1 file changed, 8 insertions(+), 8 deletions(-)
.github/workflows/build.yaml +8 -8
index 2df495c..0f5e617 100644
@@ -54,11 +54,11 @@
     steps:
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
       - name: Install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
       - name: Install dependencies
         run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
       - name: configure OpenVPN with cmake
@@ -88,11 +88,11 @@
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
           vcpkgJsonGlob: '**/mingw/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest
@@ -276,7 +276,7 @@
       runs-on: windows-latest
       steps:
       - uses: actions/[email protected]... # v4.2.2
-      - uses: lukka/[email protected]... # v3.31.6
+      - uses: lukka/[email protected]... # v4.0.0
 
       - name: Install rst2html
         run: python -m pip install --upgrade pip docutils
@@ -284,7 +284,7 @@
       - name: Restore artifacts, or setup vcpkg (do not install any package)
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+          vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687
           vcpkgJsonGlob: '**/windows/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest (NO TESTS)
@@ -471,8 +471,8 @@
           path: aws-lc
           # versioning=semver-coerced
           repository: aws/aws-lc
-          ref: v1.42.0
-      - uses: lukka/[email protected]... # v3.31.6
+          ref: v1.49.1
+      - uses: lukka/[email protected]... # v4.0.0
       - name: "AWS-LC: build"
         run: |
           mkdir build
Signature · 13 lines
To view, visit http://gerrit.openvpn.net/c/openvpn/+/934?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd
Gerrit-Change-Number: 934
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: uddr <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged